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