Merge "Switch active map implementation to segment based."

diff --cc vp9/encoder/vp9_encoder.c
index bc240ff556976cb120eddb86a1f3ec6c5b759504,250252702761f405cbd73c9072aa4c886e1cae80..7eeb644f25689206881f5b9ee389cb383169e756
--- 1/vp9/encoder/vp9_encoder.c
--- 2/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@@ -174,11 -176,7 +174,8 @@@ static void dealloc_compressor_data(VP9
    vp9_cyclic_refresh_free(cpi->cyclic_refresh);
    cpi->cyclic_refresh = NULL;
  
-   vpx_free(cpi->active_map);
-   cpi->active_map = NULL;
- 
    vp9_free_frame_buffers(cm);
 +  vp9_free_context_buffers(cm);
  
    vp9_free_frame_buffer(&cpi->last_frame_uf);
    vp9_free_frame_buffer(&cpi->scaled_source);