Merge "Compilation fixes after new layoutlib drop"