Merge "Fix broken drawCircle LayoutLib."