Merge "Update tests per new layoutlib_api" into mnc-dev