am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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