Merge "Mark libion vendor_available."
am: b538f96fe1

Change-Id: I195145af90433c29ce9e408197e8d7183cb960bc