Merge "Add vendor_available to libz" am: 8f227ebc3d
am: 9133dc44ad

Change-Id: Ifcbb212e5ef72c03ade6df02be8a540f21ab7b17