Merge 3b88ba8cef2e2e0a5f1e4b4a8b990bec91f55218 on remote branch

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