Bring back MusicFX
Revert "Changes for cm bionic"

This reverts commit 8751e66b77e0b779d2f766c4b8ec322beda0af95.
Specify -mcpu=cortex-a15 for krait CPU variants.

Bug: 11178216

Change-Id: I9922e4cd5ba27e3857798aae5c84299e26e054ea
armv7-a-neon: cleanup and fix cpu variant detection

Summary:
Fixes armv5te defaults for anything other than cortex-a7, cortex-a9,
cortex-a15, or krait.

Test Plan: verify on grouper

Reviewers: randall.rushing, synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D195