Android 7.0.0 release 4
Merge "Avoid shifts of negative values inflateMark()."