Merge "LayoutLib: fix some tests"