Merge cherrypicks of ['googleplex-android-review.googlesource.com/20897723'] into tm-qpr2-release.

Change-Id: I7f1fdba02c95c159c6637f5de213a838e9bce341
tree: 57cc1652a26ced74eb8f34f0b85cb158f4ba4079
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. SoongConfig.bp