Merge "Include testdata in layoutlib-tests."