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

* commit '477687c1eb1919c54e2bffba2a740df3b4af6668':
  Fix SDK layout rendering in Eclipse.