Android 7.1.1 Release 41 (N4F27E)
Merge "Avoid shifts of negative values inflateMark()."