This reverts commit 0dc0ddc0. Reason for revert: enc/dec mismatch was found and tracked down to this commit. BUG=aomedia:1123 Change-Id: I47ac289426e18d2118117d56c2cbc8930b78bda2