Merge "Add vendor_available to liblog_headers." am: f42d02830d  -s ours
am: f2a35db75c

Change-Id: I29ff70be1034b5ea43a23b02fab038a94512e68d