Merge "Move math function definitions." am: b5e90583ef
am: d1eab0ea46

Change-Id: Ibef05e7c0ffee8d02e49c2d4893b4fa28f153a2f