Merge "clang-headers are marked as vendor_available" am: 2757dac441 am: 794bc38521
am: 9afc808550  -s ours

Change-Id: Id6c4a38f4c2965b7977df756ab224c9f4c1152df