Android 7.1.1 Release 42 (N6F27E)
Merge "Avoid shifts of negative values inflateMark()."