webp: build with -O2

set LOCAL_ARM_MODE=arm as well.
on arm devices -O2 will improve performance ~11-22%. arm mode gives the
same relative improvement with -O2, but the absolute values improve
another 11-17%.

(cherry picked from commit e8293623a61a0a2e9c184d5844eef65c52d094f8)

Change-Id: I0371d5c7d6f4622dac4d317f4f44be59decdf3f2
diff --git a/src/Android.mk b/src/Android.mk
index 555db44..854314d 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -77,7 +77,8 @@
         utils/thread.c \
         utils/utils.c
 
-LOCAL_CFLAGS := -DANDROID -DWEBP_SWAP_16BIT_CSP
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS := -O2 -DANDROID -DWEBP_SWAP_16BIT_CSP
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/enc \
@@ -147,7 +148,8 @@
         utils/thread.c \
         utils/utils.c
 
-LOCAL_CFLAGS := -DANDROID -DWEBP_SWAP_16BIT_CSP
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS := -O2 -DANDROID -DWEBP_SWAP_16BIT_CSP
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/dec \