Merge "Use fabsf() rather than abs()"