am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now."

* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.