Merge "Export libxml2_headers" am: 785b129d60 am: a3ba3d5d17 am: b0a7d4f7f8
am: c3f0b67c61

Change-Id: I935aea72879d049fe7ca3a17828b22fbe2e3483d