am 4125d8ee: am a4781e86: Merge from open-source gingerbread

* commit '4125d8ee68bec37fe471faeca7dfade73a7a1592':
  CTS: pass vogar expectation location to CollectAllTests.