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