Android 7.1.2 release 10
Merge "Avoid shifts of negative values inflateMark()."