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

* commit '347195da2ea801db95cf201fa7516bf392dc005a':
  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