Merge "vpx_mem: remove memory manager code"