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

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