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

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