Merge "Move math function definitions." am: b5e90583ef am: d1eab0ea46 am: a2f3561259
am: 8fb19697da

Change-Id: I3123be285279a44878d131cb11c14442acb40e9f