Merge "Convert webp to Android.bp" am: 9d4922f523
am: 3f7b306e19

Change-Id: I507fd8cdedf5b8333562cecd9be7801b347e8994