Merge "Layoutlib native delegate: primitive shapes and shaders"