Android 7.1.0 release 3
Merge "Avoid shifts of negative values inflateMark()."