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

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