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

Change-Id: I9e2822d64eb431ef646fe35d958ccecab0342c26