Merge "Add missing calls to emms in the adaptive quantization code"