Merge "Remove unneeded inclusion of rs_math.rsh."