Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 8a1a3f8075

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