Merge "libm\'s headers have moved to live with their libc cousins." am: fcbd4d8
am: 617e0fc

* commit '617e0fc6daa51ca2088315e72ecb5a9de84529e0':
  libm's headers have moved to live with their libc cousins.

Change-Id: Id3b57b5d13f11da8e6f8182e3448bf7541fbd46c