Merge "Fix ViewGroup_MarginLayoutParamsTest failures" into jb-mr1-dev