am 214af0ad: am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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