Update commit sha for swift default ports cherry pick