and fix up some confusion in SC and STARMATH about which constants to
use

Change-Id: Ib75bc78a24bd2fad6ec6d7c94c4c1ad7dc222c1a