stagefright: Clean up the ifdefs

 * This should get everything in line for now.

Change-Id: I3e8eaddeab34dbacb7138f9106f53ada404f7b4d
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_frameworks_av into cm-11.0