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

Change-Id: If8edb7ed88307d5024e464cb71b58e5dff7e4ef6
tree: c776ec1c7a5268aa5a195457601e268d738587ce
  1. .prebuilt_info/
  2. 3/
  3. 4/
  4. 5/
  5. 6/
  6. 7/
  7. current/
  8. go/