Merge "LayoutLib: Fix broken sdk builds"