Merge "Mark libion vendor_available." am: b538f96fe1 am: 44895afce3
am: ff13a63035

Change-Id: I3f3c582bd006ba347d8f9d77c33e83a87be292e7