upgrading android-sdk to r22.0.1 part 2