Merge 125c139fefe6dbd7925727c0841aa73079a7d1a5 on remote branch

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