Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"