Manually merge changes from giant AOSP topic

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