Android 7.1.1 Release 31 (N4F26U)
Merge "Avoid shifts of negative values inflateMark()."