Merge "LayoutLib: support for custom styles." into eclair