Android o preview 2
Remove use of LOCAL_COPY_HEADERS am: 5a0a6e5203 am: 0363d80864
am: d4f66de2e7

Change-Id: I3a1827b2b3a6d04b48924d86e653ce5217dbebca