Merge "Correct overflow check in Parcel resize code"