Compilation fixes after new layoutlib drop

Test: N/A
Change-Id: I11475b2d2be4e8fdbd734c9ca38073076f68b13b
5 files changed