am 15c7ae34: Merge "Stop using LOCAL_COPY_HEADERS in expat."

* commit '15c7ae3416c46c9f753df12e194511db76afea41':
  Stop using LOCAL_COPY_HEADERS in expat.