Merge "Using functions from vpx_mem.h inside vpx_image.c."