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

(cherry picked from commit 56331f0843a8cf2609a7517b933df7584cb88dc6)