Merge "libutils: mark as vendor_available" am: 86c725a4c2
am: 7c8b168c4e

Change-Id: Ie78167b0b908bf97fa018c03ec1c07d8be6158f6