Merge "Revert "Export libxml2_headers"" am: 81abc1de29 am: 8ae904f6bc
am: 0d6a909655

Change-Id: I144aa2c541b51349a2b5394394cc0b5efa654fc1