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

Change-Id: I3d39339fdbe9e1b7eefcc0b806ce1c2efc38dcb5