Merge 59fa028a from open-source master

Change-Id: I46a77b535ed15b474a6fe807b7630a0f2918c1be
tree: 577aa530121c33fe42866014c4ec36631588da2e
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. ThirdPartyProject.prop