Merge "Revert "goldfish: remove redundant entry in PRODUCT_COPY_FILES""