am 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev

* commit '136bd7c6aef8767dc208811ad87f90956333e78f':
  Fix SDK layout rendering in Eclipse.