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

* commit '0931ed239bd1bd38d79fcd85e176e27af8537cc8':
  Fix gtest soong unbundled builds