Merge "LayoutLib: support for Path and BitmapShader using delegates."