Merge "Layoutlib Canvas and Paint implementation through native delegates"