Merge "Remove ELF PRODUCT_COPY_FILES" am: c7a92fea06 am: 2403780974 am: 1fb7f424bd am: 47cda96508 am: 1e6552296b

Change-Id: I3bdf6678c7adde792db4c3e6705e8e10bf3545be