Merge "LayoutLib: Adapt to new LayoutLib"