Merge "vp8e - remove unnecessary variance calc"