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

Change-Id: I3d7184818c34dfd9a0b96b9c9032003d2a881a8d