Updated Android SDK version to 21