Fix build error on ARMv6

Change-Id: Idedf64ae64804cd68e2cdef20fa1d1b56798a0eb

Conflicts:
	native/jni/Android.mk