Merge "More implementation of the layoutlib Paint/Canvas delegates."