Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"