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