am 528c8fa1: am 4653cb89: cpufeatures license is BSD, no Apache 2.0

Merge commit '528c8fa1827b36c19ff92655bb40012415761193'

* commit '528c8fa1827b36c19ff92655bb40012415761193':
  cpufeatures license is BSD, no Apache 2.0