am 31ab6ac0: am 8cc8f7e0: am 709bb0f7: Merge "Remove ThirdPartyProject.prop."

* commit '31ab6ac05ebbf29f767a15525f6f7fa2054cc8e3':
  Remove ThirdPartyProject.prop.