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

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