Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_hardware_ti_omap4xxx into jb-mr1