Merge "Remove ELF PRODUCT_COPY_FILES" am: c7a92fea06

Change-Id: I06285c8dc2be81c0a0f4b2213a6f5a265ad2a713