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

Change-Id: Ibc91cb790569677edc5db7a1967d148a7c382c38