Merge "Remove repeated vpx_integer.h from vp9_prob.h"