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