Merge "Correct overflow check in Parcel resize code" into security-aosp-mnc-mr1-release