Merge "Stop using LOCAL_COPY_HEADERS in expat."