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