Android 7.0.0 Release 12 (NBD90W)
Merge "Avoid shifts of negative values inflateMark()."