Merge "Simplify attribute extraction for themed Drawables"