Still attempting to rebase to Android 2.3.3 successfully in git