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

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