Android 7.1.1 release 12
Merge "Avoid shifts of negative values inflateMark()."