Merge "Update WebView tests to use long version codes."