Merge 686a38894b196778e74db47b018d5b280cdff70b on remote branch

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