Merge "libm symbol cleanup." am: 4ebed99e25
am: 8d21ab4fda

Change-Id: I8b7d3451e165e7d696cbaa9a3f314f909c3d6b0f