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

Change-Id: I5048dfbbc6c9d5b731fa2560344a14016cd6e400