Merge "build_verity_metadata.py: allow disabling verity" am: 98bacf6d6c am: c1c50295eb am: 05f59dcb5f
am: 1d9bcdf6be

Change-Id: I562934ce4a1ae33526d99b9e8910e4c1bd0970e4