am 4a6bed40: Reconcile with ics-mr1-release

* commit '4a6bed40a4c13594b0c1e2c0aeabb2b1940f4d9a':
tree: 868fe7f19ba7f688795716f31888540232a9105a
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. ThirdPartyProject.prop