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

Change-Id: I0af082d24fb7946673caa7e6c46c58ce8833ac1e