Merge branch 'qcril' of git://github.com/CyanogenMod/android_frameworks_base into cm-11.0