am 27b0a497: Merge change 3315 into donut

Merge commit '27b0a4977829fa0cc362506236d17e95192a6f37'

* commit '27b0a4977829fa0cc362506236d17e95192a6f37':
  Remove test library and instrumentation defs from Browser.