Merge "Use precise header files in vp9_entropymv.h"