Merge "Add vendor_available to libz" am: 8f227ebc3d am: 9133dc44ad am: 63d2b47735
am: 9c34d31bb3

Change-Id: I64fc420e19fe1d9cdcd7500ff64cebd6a768ce81