Fix derp in new v7a-neon config

This breaks teh build. fixit

Change-Id: I0bc7cb7090c68628673afe9ccf03ea49cc875fd6
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0