Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_av into cm-11.0
Merge remote-tracking branch 'aep/cm-11.0' into HEAD