Merge "Use NDK libraries for x86 and MIPS build."