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

Change-Id: I6de8b707f2ed298df5ae6f1ef0cb9bc53524b863