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

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

Change-Id: Ib31e7262da17dfad7a50172d1ebd2735d6090338