Merge "webp: kill CPU features and use upstream NEON detection"