Merge change 23804 into eclair

* changes:
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.