Android CTS 6.0 Release 24 (4400446)
merge in marshmallow-cts-release history after reset to marshmallow-cts-dev