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

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