Merge "Include Shapes in LayoutLib." into mnc-dev