am a970bf52: Merge change I34f51342 into eclair

Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-mr2

* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
  Fix the layoutlib test to run from adt-tests.