Merge "Silence PRODUCT_COPY_FILES ignored messages" am: 288521a615 am: fe590192de
am: c8921864da

Change-Id: Ifb47c16826478ade46ab8abebb39a5025bb6f5b9