Merge "Mark libxml2 as vendor_available" am: 2975f91c5a
am: d33c7a7d61

Change-Id: I3f158bae32e91838932251d9c1a41d6b89e4f815