Merge "Fix gtest soong unbundled builds" am: 0931ed239b
am: 9cffd81dd9

* commit '9cffd81dd9df243cce02c811c67a0bb341bb35ba':
  Fix gtest soong unbundled builds