Merge "Add the missing Parcel.writeInterfaceToken call."