Merge "Use target-specific PRIVATE_CLEAN_FILES"