Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb