Revert "fix border style without borderRadius"

Summary:
Subj broke ObjC snapshot tests

This reverts commit 58876d5.
Closes #7303

Differential Revision: D3243670

fb-gh-sync-id: acef6bc7a50b0fa7dc112b88407644e8226d6f85
fbshipit-source-id: acef6bc7a50b0fa7dc112b88407644e8226d6f85

Author: bestander

Examples/UIExplorer/ViewExample.js

@@ -46,6 +46,7 @@ var ViewBorderStyleExample = React.createClass({
         <View>
           <View style={{
             borderWidth: 1,
+            borderRadius: 5,
             borderStyle: this.state.showBorder ? 'dashed' : null,
             padding: 5
           }}>

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java

@@ -95,14 +95,10 @@ private static enum BorderStyle {
 
   @Override
   public void draw(Canvas canvas) {
-    updatePathEffect();
-    boolean roundedBorders = mBorderCornerRadii != null ||
-        (!CSSConstants.isUndefined(mBorderRadius) && mBorderRadius > 0);
-
-    if ((mBorderStyle == null || mBorderStyle == BorderStyle.SOLID) && !roundedBorders) {
-      drawRectangularBackgroundWithBorders(canvas);
-    } else {
+    if ((!CSSConstants.isUndefined(mBorderRadius) && mBorderRadius > 0) || mBorderCornerRadii != null) {
       drawRoundedBackgroundWithBorders(canvas);
+    } else {
+      drawRectangularBackgroundWithBorders(canvas);
     }
   }
 
@@ -235,6 +231,7 @@ private void drawRoundedBackgroundWithBorders(Canvas canvas) {
       mPaint.setColor(ColorUtil.multiplyColorAlpha(borderColor, mAlpha));
       mPaint.setStyle(Paint.Style.STROKE);
       mPaint.setStrokeWidth(fullBorderWidth);
+      mPaint.setPathEffect(mPathEffectForBorderStyle);
       canvas.drawPath(mPathForBorderRadius, mPaint);
     }
   }
@@ -301,17 +298,10 @@ private void updatePath() {
         bottomLeftRadius + extraRadiusForOutline
       },
       Path.Direction.CW);
-  }
 
-  /**
-   * Set type of border
-   */
-  private void updatePathEffect() {
     mPathEffectForBorderStyle = mBorderStyle != null
         ? mBorderStyle.getPathEffect(getFullBorderWidth())
         : null;
-
-    mPaint.setPathEffect(mPathEffectForBorderStyle);
   }
 
   /**