Merge "WebViewZygoteInit: minor cleanup to handlePreloadPackage."