Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Id704e1ada68cdde51a15744a1d0a9d28dc4e9d45
Change-Id: I89d21eef485cf9fbedfce8648fca7e1c6ab4bace
tree: 4c0a7cd9a05c60ea1bef3252d7b8cdb62d9ed881
  1. checks/
  2. src/
  3. Android.bp