Merge change 3315 into donut

* changes:
  Remove test library and instrumentation defs from Browser.