Merge "support horizontal scroll and zoom for webview" am: 63621ece0b am: fa9278293f
am: 224b9c2895  -s ours

Change-Id: Ifc7ffb4f37a3788a0674005311b0f8c4fa7c7fe1