Merge change I34f51342 into eclair

* changes:
  Fix the layoutlib test to run from adt-tests.