am 56a41fe9: am f6faba15: am 62d9390d: (-s ours) am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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