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

* commit 'fb42be77ea88470c71f2ad1e03bff7fdc3721465':
  Fix UNSPECIFIED measurement in RelativeLayout