Merge 05542d96015c88e6bcb9339b46f25c10c5073214 on remote branch

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