Merge "Fix OGG recognition for 64 bit"