Merge "Convert cpufeatures to Soong" am: 983ca04ca9 am: 780980730b
am: ff7764e5f2

Change-Id: I869d0ad83a26db55a03f9685efccb259105664c2