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

Change-Id: Ia484c1a19bf0d3cd74662e8a572900e8ae803597