Remove use of LOCAL_COPY_HEADERS am: 5a0a6e5203 am: 0363d80864 am: d4f66de2e7 am: e210979b2e Change-Id: I146fe10f5c50031c72d6542f6edd29922b54e103