Android CTS 7.1 Release 13 (4486237)
Merge "Avoid shifts of negative values inflateMark()."