Conflicts: vp8/encoder/rdopt.c Use new constant (110) from 10ed60dc Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4