This is to fix compiling issues with aom-highbitdepth. Change-Id: I66ee73e014a028536747e55209f20be81e906267