Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev