Merge "Mark libion vendor_available." into oc-dev
am: c9b14b96c1  -s ours

Change-Id: I7598dc8c8299ffff108889e30639f91911d7c5d5