Properly merge the tile context models in lv-map

Merge the tile context models at the end of frame coding.

Change-Id: I0a71c49c448cfbd71fb0bd15ca7b1f6097c56529

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 988699b..8097431 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -2210,8 +2210,17 @@
 
   aom_cdf_prob *fc_cdf_ptr;
 
+#if CONFIG_LV_MAP
+  AVERAGE_TILE_CDFS(txb_skip_cdf)
+  AVERAGE_TILE_CDFS(nz_map_cdf)
+  AVERAGE_TILE_CDFS(eob_flag_cdf)
+  AVERAGE_TILE_CDFS(dc_sign_cdf)
+  AVERAGE_TILE_CDFS(coeff_base_cdf)
+  AVERAGE_TILE_CDFS(coeff_lps_cdf)
+#else
   AVERAGE_TILE_CDFS(coef_head_cdfs)
   AVERAGE_TILE_CDFS(coef_tail_cdfs)
+#endif
 }
 
 void av1_average_tile_mv_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[],