am 9f473342: am 33df5c6b: Merge "Fix ViewGroup_MarginLayoutParamsTest failures" into jb-mr1-dev

* commit '9f4733423692aefe3b16443b00b5b6320de04e6b':
  Fix ViewGroup_MarginLayoutParamsTest failures