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

Change-Id: Ifb772be0883230b03702e2728deb880034388a36