Merge pull request #5803 from hieupham007/timob-17155

[TIMOB-17155]: Android - re-add child view with correct index.

android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java

@@ -1178,16 +1178,18 @@ private void initializeBorder(KrollDict d, Integer bgColor)
 					// If the view already has a parent, we need to detach it from the parent
 					// and add the borderView to the parent as the child
 					ViewGroup savedParent = null;
+					int childIndex = -1;
 					if (nativeView.getParent() != null) {
 						ViewParent nativeParent = nativeView.getParent();
 						if (nativeParent instanceof ViewGroup) {
 							savedParent = (ViewGroup) nativeParent;
+							childIndex = savedParent.indexOfChild(nativeView);
 							savedParent.removeView(nativeView);
 						}
 					}
 					borderView.addView(nativeView, params);
 					if (savedParent != null) {
-						savedParent.addView(borderView, getLayoutParams());
+						savedParent.addView(borderView, childIndex, getLayoutParams());
 					}
 					borderView.setVisibility(this.visibility);
 				}