Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14' * commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14': Fix the layoutlib test to run from adt-tests.
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14' * commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14': Fix the layoutlib test to run from adt-tests.