Backed out changeset 5a84ab13274a (bug 1337440) for Android build bustage

mobile/android/base/java/org/mozilla/gecko/home/activitystream/topsites/CirclePageIndicator.java

@@ -214,14 +214,6 @@ public class CirclePageIndicator
         return mSnap;
     }
 
-    private boolean isRtl() {
-        return ViewUtils.isLayoutRtl(this);
-    }
-
-    private float getRadiusRelativly() {
-        return getRadius() * (isRtl() ? -1 : 1);
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
@@ -239,25 +231,23 @@ public class CirclePageIndicator
             return;
         }
 
-        final int longSize;
+        int longSize;
-        final int longPaddingBefore;
+        int longPaddingBefore;
-        final int longPaddingAfter;
+        int longPaddingAfter;
-        final int shortPaddingBefore;
+        int shortPaddingBefore;
-        final float threeRadius;
         if (mOrientation == HORIZONTAL) {
             longSize = getWidth();
             longPaddingBefore = getPaddingLeft();
             longPaddingAfter = getPaddingRight();
             shortPaddingBefore = getPaddingTop();
-            threeRadius = getRadiusRelativly() * SEPARATION_FACTOR;
         } else {
             longSize = getHeight();
             longPaddingBefore = getPaddingTop();
             longPaddingAfter = getPaddingBottom();
             shortPaddingBefore = getPaddingLeft();
-            threeRadius = mRadius * SEPARATION_FACTOR;
         }
 
+        final float threeRadius = mRadius * SEPARATION_FACTOR;
         final float shortOffset = shortPaddingBefore + mRadius;
         float longOffset = longPaddingBefore + mRadius;
         if (mCentered) {