am cfb0048b: am 7ef3bfec: Merge "Remove WebViewClassic specific test code" into klp-dev

* commit 'cfb0048b714fa52e8bfb9884357d36c1490a3edc':
  Remove WebViewClassic specific test code