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

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