Merge "LayoutLib: Finish the matrix delegate." into honeycomb