Merge "LayoutLib: Use special view cookie for include-merge case." into honeycomb