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