Update Math to fix nasty caching bug

Change-Id: I71af80374fbe54641afd639e7b793060e3bf4caa
Merge "Update Math to fix nasty caching bug" into wmf/1.21wmf11