Merge 5cbac4f4fb35eaa4617d46c2f799286aaf4a5ce6 on remote branch

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