Android CTS 7.0 Release 24 (4890522)
Merge "Avoid shifts of negative values inflateMark()."