Merge "Update x86 toolchain i686-linux-android-4.6 (darwin-x86)"