Merge "Continued rate control clean-ups"

diff --cc vp9/encoder/vp9_firstpass.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
index 7ba5bc47d6a6a078bfdfee3e9019187f44b7dada,338dd3f19bb4cba14c6b3db87a5968cadb0bc6f0..b0314475f2ff4723fb5be8ea77537539c085d913
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -161,10 -159,9 +161,10 @@@ void vp9_initialize_enc() 
      vp9_tokenize_initialize();
      vp9_init_quant_tables();
      vp9_init_me_luts();
-     vp9_init_minq_luts();
+     vp9_rc_init_minq_luts();
      // init_base_skip_probs();
      vp9_entropy_mv_init();
 +    vp9_entropy_mode_init();
      init_done = 1;
    }
  }