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