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

Change-Id: I7e87c09fba5a3d909e0730a2d9d35929cb55f6b3