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

Change-Id: I60fd37059077b2d8ad76239e3ce8c1591b1d6e63