Simplify ifdef's in encoder.

Change-Id: I110f7b6cad1935351f8d379bc8a208363e07ecd0

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 1066e07..828cad8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4846,18 +4846,14 @@
     write_global_motion(cpi, header_bc);
 #endif  // CONFIG_GLOBAL_MOTION
   }
-#if CONFIG_EC_MULTISYMBOL
-#if !CONFIG_EC_ADAPT
+#if CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
 #if CONFIG_NEW_TOKENSET
   av1_coef_head_cdfs(fc);
 #endif
   av1_coef_pareto_cdfs(fc);
   for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
-#if CONFIG_EC_MULTISYMBOL
   av1_set_mode_cdfs(cm);
-#endif
-#endif  // !CONFIG_EC_ADAPT
-#endif
+#endif  // CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
 #if CONFIG_ANS
   aom_buf_ans_flush(header_bc);
   header_size = buf_ans_write_end(header_bc);