Merge "ARM: OMAP: android_omap_defconfig: lock CPU freq during suspend" into p-android-omap-3.4