Merge "Move math function definitions." into oc-dev
am: fb3424166b  -s ours

Change-Id: I699f0527d58eb146686e40271aa766420dbdb99a