Merge WebKit at r60074: Fix conflicts

Merge WebKit at r60074: Fix conflicts

DeviceOrientation
- WebCore/Android.derived.jscbindings.mk
- WebCore/Android.derived.v8bindings.mk
- WebCore/page/Page.cpp

Trivial
- WebCore/css/CSSParser.cpp
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
- WebCore/rendering/style/RenderStyle.h

Code deletion - See http://trac.webkit.org/changeset/59749
- WebCore/html/HTMLTokenizer.cpp

PluginView JSC guards uspstreaming
- WebCore/plugins/PluginView.cpp
- WebCore/plugins/PluginView.h

Refactoring, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderLayer.cpp

RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderBlock.h

Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6