Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_av into kitkat