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

Change-Id: I4b1e5931f7f23cade7e732f8f26709b9b0c01426