Android CTS 7.1 Release 12 (4439252)
Merge "Avoid shifts of negative values inflateMark()."