Merge "support horizontal scroll and zoom for webview"
am: 63621ece0b

Change-Id: If60034faacbda088d94309b39cd61999838d2ac3