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

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