Merge "Use i686-linux-android-4.6 for x86 build"