a5074a8b8b
Conflicts: vp8/encoder/encodeframe.c vp8/encoder/rdopt.c Change-Id: I3c66714e704b22569aff701cc5b9b2a5b70989f3