Android CTS 7.0 Release 9 (3943095)
Merge "Avoid shifts of negative values inflateMark()."