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

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