Merge "Code cleanup for vp9-denoiser."