Android 7.1.1 Release 49 (N9F27H)
Merge "Avoid shifts of negative values inflateMark()."