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