Merge "Android NDK support for x86 and mips"