am 44bce0fb: merge from open-source master

Merge commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3' into kraken

* commit '44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3':
  cpu-features.h is only available for ARM