Merge cherrypicks of ['googleplex-android-review.googlesource.com/23770131'] into udc-release.

Change-Id: I16752b45145de51ecc2430f0c36167c0220d528a
tree: 9bbc5c9a8a3015f0da88b3a31d245733951e8a18
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. 7/
  5. current/
  6. Android.bp
  7. METADATA
  8. OWNERS