Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Iccb4be50afa29e412efb54c9d7376efc8cbf083d
tree: 4d25e164440f74b518a137878002d5420db94f77
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version