Merge "Fix build with prebuilt webview"