am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed"

* commit '304a7a9fab6b907801b911ee77542296884c9d91':
  Use libc++ versions of gtest libs when needed