Match the order of control args

Make the order of av1_ctrl_args the same as av1_arg_ctrl_map.

BUG=aomedia:3545

Change-Id: If697c235cd844495db59f400284d0b7c5117de79
(cherry picked from commit 97e6d48d)

apps/aomenc.c

@@ -439,12 +439,12 @@ const arg_def_t *av1_ctrl_args[] = {
 #endif
   &g_av1_codec_arg_defs.dv_cost_upd_freq,
   &g_av1_codec_arg_defs.partition_info_path,
-  &g_av1_codec_arg_defs.enable_rate_guide_deltaq,
-  &g_av1_codec_arg_defs.rate_distribution_info,
   &g_av1_codec_arg_defs.enable_directional_intra,
   &g_av1_codec_arg_defs.enable_tx_size_search,
   &g_av1_codec_arg_defs.loopfilter_control,
   &g_av1_codec_arg_defs.auto_intra_tools_off,
+  &g_av1_codec_arg_defs.enable_rate_guide_deltaq,
+  &g_av1_codec_arg_defs.rate_distribution_info,
   NULL,
 };