Android CTS 7.0 Release 16 (4438873)
Merge "Avoid shifts of negative values inflateMark()."