Merge "mathtest is more useful if it tests libm." am: 4689399229 am: 70c38b33a1 am: 2cabe2b0ce
am: 63843d9423

Change-Id: I243304fd3260122fdd8107b054f504134be2a7f3