Android SDK: Merging master into unstable