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

* commit '33df5c6b724e95eb8b420efb429549478889b768':
  Fix ViewGroup_MarginLayoutParamsTest failures