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