Remove use of LOCAL_COPY_HEADERS am: 5a0a6e5203
am: 0363d80864

Change-Id: I8d436a140549ce0f1c7533d015f82f672fc8e5ca