Merge "Add vendor_available to liblog_headers." am: f42d02830d  -s ours am: f2a35db75c am: 72180d4361
am: 102d7a6ea5  -s ours

Change-Id: I9a1f6daf0a973bd24b717767b7292c5136b05da4