Merge cherrypicks of ['googleplex-android-review.googlesource.com/34375480'] into security-aosp-tm-release.

Change-Id: Ic81c54c91383c9b12b4c8a231fe1318a36301ec3
tree: 7a66e0ef01a765a57220b61ccea6f2d8c417b913
  1. res/
  2. robotests/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. OWNERS