manual merge - fix build

Change-Id: I5417fd6ad71fd3cd0520f1fe89921fa01f8a0869
tree: 7b75c46004b807f9a00d6bd39a35f03add671a49
  1. src/
  2. CleanSpec.mk
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. ThirdPartyProject.prop