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

* commit '8e063a9de11933ab6b9839d67c74aed899743853':
  reduce differences between Android and upstream

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