Ensure format_options are always ordered.

This makes it easier to test consistently for JDK8.
DO NOT APPLY. Clearly incorrect changes for JDK8 build.