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