Merge change Ia86f2849 into eclair

* changes:
  Fix layoutlib tests so they pas when run from Eclipse workbench.