am b46530bd: Merge "Start cleaning up libm."

* commit 'b46530bd3e5984047bd780f5d3a6a5ebabd9f02d':
  Start cleaning up libm.