Rework logic for MusicFX inclusion

Set the flag properly, instead of just messing around with it

P.S.5 Added the missing space. Should work now.

Change-Id: I83883bd80fe63a6ac12747d33e45ccd87ca44932
Merge branch 'kk' of https://github.com/CarbonDev/android_vendor_carbon into kk