am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"

* commit '4dd8c9705db909ba070a830930f1ba72a77192d4':
  Use libc++ versions of gtest libs when needed