am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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