Merge "reduce differences between Android and upstream" am: 8e063a9
am: c2aa02c

* commit 'c2aa02c088042495f34f719ddb4c82f8e5f5cc26':
  reduce differences between Android and upstream

Change-Id: I177f9037e2080b643f5b15067ffce198c258797c
tree: aed506b3e991304d32d4d237103c7a3c969535e9
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. README.version