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

Change-Id: Id20147c84a25c3be835a4299c1f9f53596323569