Android CTS 6.0 Release 24 (4400446)
Merge "Really include drawables for all densities." into marshmallow-cts-dev