Merge "Improve test coverage for java.lang.StrictMath" into sc-dev