Merge "Mark cpufeatures vendor_available." am: 2b88f8ee10
am: 0ef1796c20

Change-Id: I7ca9b975a5a9c8a9d5c78ac7ef74dc9f880c9450