Merge "Fix C++ tests to work with NDK build."