Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev