Reconcile with ics-mr1-release

Change-Id: I16b882b7eaaf26574094a2940b3eabfb2c2ed98b
tree: 868fe7f19ba7f688795716f31888540232a9105a
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. ThirdPartyProject.prop