Remove merged cherry-picks and update commit hash of RDO specific patch