Merge "New x86 toolchain: x86_64-linux-android-4.7 (darwin-x86)"