Merge "Allow libgtest on unbundled builds" am: 55cc0e85b9
am: 529764ba68

* commit '529764ba68dd5573e636e21e812ca1e4774df6b6':
  Allow libgtest on unbundled builds

Change-Id: I9c7138f7f0c7462ede07322710580ae9aa3eece3