am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit 'c61e53e7e20a097342f461c1848f8a7c15898f44':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]