Merge branch 'android-omap-3.0' into cm-10.1