Merge changes Ifb6cc64e,I4d819cc5

* changes:
  Simplify logic in ScrollableLayerAndroid::scrollTo()
  Fixes style and adds some comments to layers code

diff --cc Source/WebCore/platform/graphics/android/LayerAndroid.cpp
Simple merge

diff --cc Source/WebCore/platform/graphics/android/LayerAndroid.h
Simple merge

diff --cc Source/WebKit/android/nav/WebView.cpp
Simple merge