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