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

Change-Id: I4f9783e70885df8fe5ebcde36c88c6790b48cc66