Merge branch 'omap3-android-3.0.y' into encore-omap3-3.0.y
Merge branch 'encore-omap3-3-dsscomp' into encore-omap3-3.0.y