Merge "Update layoutlib tests to check methods return value."