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

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