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

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