update for java.lang.NoSuchMethodError: com.android.launcher.Workspace.setScrollX
Merge branch 'android-2.1_r2.1s' of https://github.com/airshiplay/Launcher into android-2.1_r2.1s