Merge "Tidy up java.lang.Math and java.lang.StrictMath." into dalvik-dev