Merge "vpx_internal_error -> fix -Wunused-function issues"