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

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