This reverts commit 5ca25dfc.

It breaks high-bitdepth builds with:
--enable-aom-highbitdepth --enable-experimental --enable-dual-filter
--enable-entropy --enable-ext-inter --enable-ext-intra
--enable-ext-partition-types --enable-ext-refs --enable-ext-tx
--enable-filter-intra --enable-loop-restoration

or more simply:
--enable-aom-highbitdepth --enable-experimental --enable-ext-inter

BUG=aomedia:463

Change-Id: If814131e634e4411569859f7426efafe158b83fd