Android CTS 7.0 Release 20 (4649614)
Merge "Avoid shifts of negative values inflateMark()."