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

Change-Id: I49fbed7401066cf441712811ab625abddc8b92b8