Merge "Fix ndk-build and ndk-build.cmd to observe NDK_HOST_32BIT"