Merge "Remove obsolete ThirdPartyProject.prop files."