Android 7.0.0 Release 13 (NBD90X)
Merge "Avoid shifts of negative values inflateMark()."