Fix build with both ec-adapt and ext-intra enabled
Fix build with both ec-adapt and ext-intra enabled

BUG=aomedia:80

Change-Id: I8b0c74c44d454630d8f32a6b0124f5684d0b1cdf

mbebenita/aom,mbebenita/aom,smarter/aom,mbebenita/aom,luctrudeau/aom,GrokImageCompression/aom,GrokImageCompression/aom,mbebenita/aom,smarter/aom,mbebenita/aom,mbebenita/aom,luctrudeau/aom,GrokImageCompression/aom,luctrudeau/aom,mbebenita/aom,smarter/aom,GrokImageCompression/aom,luctrudeau/aom,GrokImageCompression/aom,luctrudeau/aom,GrokImageCompression/aom,smarter/aom,mbebenita/aom,smarter/aom,luctrudeau/aom,smarter/aom,mbebenita/aom