Merge branch 'android-omap-3.0' into android-omap-tuna-3.0