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

Change-Id: If9fa342365ac0a8942ae2de96f4cf89a6d0b8ade