Merge "webp: kill CPU features and use upstream NEON detection" am: c09614dd8c am: 30ca35d74e am: 1480ddd0fe
am: 5b57986b2f

Change-Id: I3c1cdbc9bb06faad91f53d63fc031cd860791adc