Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp * commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524': Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp * commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524': Fix layoutlib tests so they pas when run from Eclipse workbench.