29e278ec7f
Merge commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c' * commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c': Fix layoutlib tests so they pas when run from Eclipse workbench.