Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4 am: e2c741ce0f
am: 8161406c59

* commit '8161406c5964fd020250b6d4c961d7bdd79944da':
  Don't include <machine/cpu-features.h>.

Change-Id: I56a268c3219153e967ad405470756122985849d2