Revert "Fix DecimalFormat related test and code cleanup"

This reverts commit 1ce527dbb76c8163e5360b16bff77791a0bcb120.

bug: 26104359
2 files changed