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