Merge "Remove ELF PRODUCT_COPY_FILES" am: c7a92fea06 am: 2403780974

Change-Id: Ia6bc0aea5b090e8de9e2405463c8a1cce5940847