Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
	vp8/common/blockd.h

Change-Id: Ica2bd1c3da614eab5ce23acfb597e777d16b3983

diff --cc vp8/common/blockd.h
index 3b4986f49ff549895b15eb07416254b22a6010ac,fc8e0722c2ec04d1ee3786aa2e946d2fbbb58934..906e05520facb3ae0eaaa50148cc662e117827ce
--- 1/vp8/common/blockd.h
--- 2/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@@ -28,12 -28,7 +28,8 @@@ void vpx_log(const char *format, ...)
  #define DCPREDSIMTHRESH 0
  #define DCPREDCNTTHRESH 3
  
- #define Y1CONTEXT 0
- #define UCONTEXT 1
- #define VCONTEXT 2
- #define Y2CONTEXT 3
  #define MB_FEATURE_TREE_PROBS   3
 +
  #define MAX_MB_SEGMENTS         4
  
  #define MAX_REF_LF_DELTAS       4