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

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