Reconcile with ics-mr1-release

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