Android 7.1.2 Release 14 (NHG47N)
Merge "Avoid shifts of negative values inflateMark()."