Merge remote branch 'origin/master' into experimental

Change-Id: I8999a33db82d38eb85482f3c423db238d6ee3ed9

diff --cc vp8/common/generic/systemdependent.c
Simple merge

diff --cc vp8/common/reconintra4x4.c
Simple merge

diff --cc vp8/decoder/detokenize.c
Simple merge

diff --cc vp8/decoder/generic/dsystemdependent.c
Simple merge

diff --cc vp8/decoder/onyxd_int.h
Simple merge

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

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

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

diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge

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

diff --cc vp8/encoder/psnr.c
index ff0222e2d0388829375d400ebefd4af1fc348a37,96b0ea8901cf176c7b67aeab8c6e480fbea7af1e..abd2ed47c54258656b32f0b84b27fff920317e46
--- 1/vp8/encoder/psnr.c
--- 2/vp8/encoder/psnr.c
+++ b/vp8/encoder/psnr.c
@@@ -11,9 -11,9 +11,9 @@@
  
  #include "vpx_scale/yv12config.h"
  #include "math.h"
- #include "systemdependent.h" /* for vp8_clear_system_state() */
+ #include "vp8/common/systemdependent.h" /* for vp8_clear_system_state() */
  
 -#define MAX_PSNR 60
 +#define MAX_PSNR 100
  
  double vp8_mse2psnr(double Samples, double Peak, double Mse)
  {

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

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

diff --cc vp8/vp8_cx_iface.c
Simple merge