Merge "Cherry-pick: [Android WebView] Fixed width set in the viewport tag must not be scaled by target-densitydpi" into klp-dev