Merge change 8825 into donut

                    View child = getChildAt(i);

                    if (child.getVisibility() != GONE && child != ignore) {

                        LayoutParams params = (LayoutParams) child.getLayoutParams();

                        if (horizontalGravity) {

                            params.mLeft += horizontalOffset;

                            params.mRight += horizontalOffset;

                        }

                        if (verticalGravity) {

                            params.mTop += verticalOffset;

                            params.mBottom += verticalOffset;

                        }

                    }

                }

            }

        }

        setMeasuredDimension(width, height);

    }