Merge commit 'a2c12ef4d44df5e029aad4a806d224e3c3c6fb68' into HEAD

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