Merge c8698ae50883ef38b97ee831e0191408922c4542 on remote branch

Change-Id: I3f417068b48149a8ca66ede5207a91a0f9cb1426
tree: 0d77aa0ab479220b8bf129f68a2cf2e8c9d9fd24
  1. disaster_recovery/
  2. libflags/
  3. .clang-format
  4. Android.bp
  5. OWNERS
  6. PREUPLOAD.cfg