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

Change-Id: Ief3e912c8e87f1e387a63e4dcfcf17f9ed406004