Merge branch 'android-toolchain'