am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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