Cleanup modem changes
Merge remote-tracking branch 'mb52x/p-android-omap3-3.0' into p-android-omap3-3.0