Merged "Adjust mBiggerTouchSlopSquare to the suitable value"

Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e