Merging in Android SDK and other recently released changes