Merge "Fix layoutlib expand unit test" into nyc-dev