Merge "Fix 3140348: Signature was wrong for atan2() in RS."