am 4b9bb0e3: am 4a6bed40: Reconcile with ics-mr1-release

* commit '4b9bb0e3de2e8cf05e9c52d20fdb7ba4397b6559':
tree: 1387d422d9fcbf49ac96838b5b280a58e684be4f
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. ThirdPartyProject.prop