More C4, less M4 on Android 2.3