Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-plus-aosp * commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f': Fix the layoutlib test to run from adt-tests.
Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-plus-aosp * commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f': Fix the layoutlib test to run from adt-tests.