Fixed ifdef and endifs
Merge branch 'cm-11.0' of https://github.com/XperiaSTE/android_frameworks_av into cm-11.0