Merge branch 'master' into nextgenv2

Change-Id: I4e5dd38caa9608252235265c7f2342b183f99815

diff --cc vp10/encoder/tokenize.c
Simple merge

diff --cc vp9/common/vp9_pred_common.c
index e4c349c72916b5df06fa6f939698874b1b690784,1bb11efdfa609bf1930a56f38cc59f4598b0acf7..e0eb0e377fa9f26285ba0b68f53a9294224cd0e9
--- 1/vp9/common/vp9_pred_common.c
--- 2/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@@ -188,11 -188,10 +188,11 @@@ int vp9_get_pred_context_comp_ref_p(con
  
  int vp9_get_pred_context_single_ref_p1(const MACROBLOCKD *xd) {
    int pred_context;
-   const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
-   const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+   const MODE_INFO *const above_mi = xd->above_mi;
+   const MODE_INFO *const left_mi = xd->left_mi;
    const int has_above = xd->up_available;
    const int has_left = xd->left_available;
 +
    // Note:
    // The mode info data structure has a one element border above and to the
    // left of the entries correpsonding to real macroblocks.

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

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

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