Merge "Aligning native Parcel implementation to Java."