Merge remote branch 'origin/master' into experimental

Change-Id: I68e604e4a731f6703fdec7eff2c2c9b9e36879ea

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

diff --cc vp8/common/onyxc_int.h
Simple merge

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

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

diff --cc vp8/vp8_cx_iface.c
Simple merge

diff --cc vpx/vp8cx.h
Simple merge