Add to PRODUCT_COPY_FILES/PRODUCT_PACKAGES instead of replacing

Change-Id: I317b5ac3399cf82e4c708b52d84112d4b7b7d3df