Merge "LayoutLib: remove some exceptions."