am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair

Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8'

* commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8':
  LayoutLib: support for custom styles.