Merge 'Add simple version of activity masking.'

Merge commit 'refs/changes/79/779/2' of
    https://review.webmproject.org/p/libvpx

Conflicts:
	vp8/encoder/encodeintra.c
	vp8/encoder/encodemb.c

Change-Id: Id607063fabe92d99eeb3c380e8ca670b01bfb3ef

diff --cc vp8/encoder/block.h
Simple merge

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/encodeintra.c
Simple merge

diff --cc vp8/encoder/encodemb.c
index e9753ac4837c3c95dd30b43250941ed5065b4999,a37188bf2887c910a63cb7498cc2f7d2293bfbd7..f7faaa14a3bc7031f9f313c3108f0c6be2c78989
--- 1/vp8/encoder/encodemb.c
--- 2/vp8/encoder/encodemb.c
+++ b/vp8/encoder/encodemb.c
@@@ -635,8 -662,11 +635,8 @@@ void vp8_encode_inter16x16(const VP8_EN
      vp8_quantize_mb(x);
  
  #if !(CONFIG_REALTIME_ONLY)
-     if (x->optimize==2 ||(x->optimize && x->rddiv > 1))
+     if (x->optimize)
 -    {
          vp8_optimize_mb(x, rtcd);
 -        vp8_find_mb_skip_coef(x);
 -    }
  #endif
  
      vp8_inverse_transform_mb(IF_RTCD(&rtcd->common->idct), &x->e_mbd);

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/onyx_int.h
Simple merge