Samsung Galaxy S II to come with Android 4.0