Android 7.1.1 Release 32 (N4F26W)
Merge "Avoid shifts of negative values inflateMark()."