am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"
am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"

* commit '6ddc3600659d4517c416ce3b06e4ccee14042030':
  build_image.py: Verity support for flashing non partition spanning fs

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build