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

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