diff --git a/Android.mk b/Android.mk
index 54e1c56..16d33d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,10 +16,6 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-ifeq ($(TARGET_ARCH),arm)
-# b/17167262, Cannot link gettime.c, undefined __aeabi_read_tp, when compiled with -fpie.
-LOCAL_CLANG := false
-endif
 
 LOCAL_CFLAGS_32 += -DBITS_PER_LONG=32 -DCONFIG_64BIT
 LOCAL_CFLAGS_64 += -DBITS_PER_LONG=64 -DCONFIG_32BIT
@@ -29,16 +25,18 @@
                   smalloc.c filehash.c helpers.c profile.c debug.c backend.c \
                   cconv.c client.c filelock.c flow.c gettime-thread.c idletime.c io_u_queue.c \
                   iolog.c json.c libfio.c memalign.c profiles/act.c profiles/tiobench.c server.c \
-                  td_error.c diskutil.c blktrace.c trim.c fifo.c cgroup.c \
+                  td_error.c diskutil.c blktrace.c trim.c fifo.c cgroup.c
 
 lib_src_files := lib/rbtree.c lib/flist_sort.c lib/getrusage.c lib/hweight.c lib/ieee754.c lib/lfsr.c \
                  lib/num2str.c lib/prio_tree.c lib/rand.c lib/zipf.c lib/inet_aton.c lib/axmap.c \
+                 lib/bloom.c lib/linux-dev-lookup.c lib/tp.c
 
 crc_src_files := crc/crc7.c crc/crc16.c crc/crc32.c crc/crc64.c crc/crc32c.c crc/crc32c-intel.c \
                  crc/sha1.c crc/sha256.c crc/sha512.c crc/md5.c crc/test.c crc/xxhash.c \
+                 crc/fnv.c crc/murmur3.c
 
-engines_src_files := engines/binject.c engines/cpu.c engines/mmap.c engines/null.c engines/net.c \
-                     engines/sg.c engines/sync.c \
+engines_src_files := engines/cpu.c engines/mmap.c engines/null.c engines/net.c \
+                     engines/sg.c engines/sync.c engines/gfapi.h
 
 engines_src_files_64 := engines/splice.c
 
@@ -56,8 +54,8 @@
 LOCAL_SHARED_LIBRARIES := libdl
 LOCAL_STATIC_LIBRARIES := libcutils libz
 
-LOCAL_LDLIBS += -ldl
-LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.1.8-80-g890b\"" \
+LOCAL_LDLIBS += -ldl -lm
+LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.2.6\"" \
                 -DCONFIG_3ARG_AFFINITY \
                 -DCONFIG_CLOCK_GETTIME \
                 -DCONFIG_CLOCK_MONOTONIC \
@@ -67,7 +65,6 @@
                 -DCONFIG_IPV6 \
                 -DCONFIG_LINUX_FALLOCATE \
                 -DCONFIG_LITTLE_ENDIAN \
-                -DCONFIG_POSIX_FALLOCATE \
                 -DCONFIG_RLIMIT_MEMLOCK \
                 -DCONFIG_RUSAGE_THREAD \
                 -DCONFIG_SCHED_IDLE \