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

Change-Id: Iae95846abaa365f8fff884ca51d9451630a9d2f4