Merge "LayoutLib: implement more of Canvas/Paint."