Merge "Move math function definitions."
am: b5e90583ef

Change-Id: I5da450082180b92cbb1028887ce6d492bdba39a0