[Initial] Blunt merge p-android-omap-3.4