am cf768044: (-s ours) am e9550087: am 874040d1: am 84f5acea: am 0b878070: (-s...

am cf768044: (-s ours) am e9550087: am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE

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