Merge "build_verity_metadata.py: allow disabling verity"
am: 98bacf6d6c

Change-Id: I32d6ea5425898d54ea1d59ab673681414304de83