am d5a12e80: various fixes for browser test harness

Merge commit 'd5a12e80fcd3ff53a1c975db2f6a89c0f28ed6cc' into gingerbread-plus-aosp

* commit 'd5a12e80fcd3ff53a1c975db2f6a89c0f28ed6cc':
  various fixes for browser test harness