am 9ae07379: Merge "Fix C++ tests to work with NDK build."

* commit '9ae073798bfe5bfc63b5f807023672405c26a792':
  Fix C++ tests to work with NDK build.