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

(cherry picked from commit 83af15b4282226b7991c04be4d328d71ce8cc436)