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