Merge "Fix NDK x86 build."