Merge branch cm-11.0 of github.com:CyanogenMod/android_packages_app…