Merge "Fix several test-resample BufferProvider bugs"