diff --git a/libc/Android.mk b/libc/Android.mk
index 2c35ff3..79acce8 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -37,128 +37,128 @@
 # Define the common source files for all the libc instances
 # =========================================================
 libc_common_src_files := \
-	unistd/alarm.c \
-	unistd/exec.c \
-	unistd/fnmatch.c \
-	unistd/syslog.c \
-	unistd/system.c \
-	unistd/time.c \
-	stdio/asprintf.c \
-	stdio/fflush.c \
-	stdio/fgetc.c \
-	stdio/findfp.c \
-	stdio/fprintf.c \
-	stdio/fputc.c \
-	stdio/fread.c \
-	stdio/freopen.c \
-	stdio/fscanf.c \
-	stdio/fseek.c \
-	stdio/ftell.c \
-	stdio/fvwrite.c \
-	stdio/gets.c \
-	stdio/printf.c \
-	stdio/refill.c \
-	stdio/rewind.c \
-	stdio/scanf.c \
-	stdio/snprintf.c\
-	stdio/sprintf.c \
-	stdio/sscanf.c \
-	stdio/stdio.c \
-	stdio/ungetc.c \
-	stdio/vasprintf.c \
-	stdio/vfprintf.c \
-	stdio/vfscanf.c \
-	stdio/vprintf.c \
-	stdio/vsnprintf.c \
-	stdio/vsprintf.c \
-	stdio/vscanf.c \
-	stdio/vsscanf.c \
-	stdio/wbuf.c \
-	stdlib/atexit.c \
-	stdlib/ctype_.c \
-	stdlib/getenv.c \
-	stdlib/putenv.c \
-	stdlib/setenv.c \
-	stdlib/strtod.c \
-	stdlib/strtoimax.c \
-	stdlib/strtol.c \
-	stdlib/strtoll.c \
-	stdlib/strtoul.c \
-	stdlib/strtoull.c \
-	stdlib/strtoumax.c \
-	stdlib/tolower_.c \
-	stdlib/toupper_.c \
-	string/strcasecmp.c \
-	string/strcspn.c \
-	string/strdup.c \
-	string/strpbrk.c \
-	string/strsep.c \
-	string/strspn.c \
-	string/strstr.c \
-	string/strtok.c \
-	wchar/wcswidth.c \
-	wchar/wcsxfrm.c \
-	bionic/arc4random.c \
-	bionic/atoi.c \
-	bionic/atol.c \
-	bionic/atoll.c \
-	bionic/bindresvport.c \
-	bionic/clearenv.c \
-	bionic/daemon.c \
-	bionic/err.c \
-	bionic/ether_aton.c \
-	bionic/ether_ntoa.c \
-	bionic/fdprintf.c \
-	bionic/flockfile.c \
-	bionic/ftime.c \
-	bionic/ftok.c \
-	bionic/fts.c \
-	bionic/getdtablesize.c \
-	bionic/gethostname.c \
-	bionic/getpgrp.c \
-	bionic/getpriority.c \
-	bionic/getpt.c \
-	bionic/if_indextoname.c \
-	bionic/if_nametoindex.c \
-	bionic/initgroups.c \
-	bionic/ioctl.c \
-	bionic/isatty.c \
-	bionic/issetugid.c \
-	bionic/ldexp.c \
-	bionic/md5.c \
-	bionic/memmem.c \
-	bionic/memswap.c \
-	bionic/name_mem.c \
-	bionic/pathconf.c \
-	bionic/perror.c \
-	bionic/ptsname.c \
-	bionic/ptsname_r.c \
-	bionic/pututline.c \
-	bionic/reboot.c \
-	bionic/recv.c \
-	bionic/sched_cpualloc.c \
-	bionic/sched_cpucount.c \
-	bionic/semaphore.c \
-	bionic/send.c \
-	bionic/setpgrp.c \
-	bionic/sigblock.c \
-	bionic/siginterrupt.c \
-	bionic/siglist.c \
-	bionic/signame.c \
-	bionic/sigsetmask.c \
-	bionic/strndup.c \
-	bionic/strntoimax.c \
-	bionic/strntoumax.c \
-	bionic/strtotimeval.c \
-	bionic/system_properties.c \
-	bionic/system_properties_compat.c \
-	bionic/tcgetpgrp.c \
-	bionic/tcsetpgrp.c \
-	bionic/time64.c \
-	bionic/umount.c \
-	bionic/unlockpt.c \
-	bionic/utmp.c \
-	bionic/wcscoll.c \
+    unistd/alarm.c \
+    unistd/exec.c \
+    unistd/fnmatch.c \
+    unistd/syslog.c \
+    unistd/system.c \
+    unistd/time.c \
+    stdio/asprintf.c \
+    stdio/fflush.c \
+    stdio/fgetc.c \
+    stdio/findfp.c \
+    stdio/fprintf.c \
+    stdio/fputc.c \
+    stdio/fread.c \
+    stdio/freopen.c \
+    stdio/fscanf.c \
+    stdio/fseek.c \
+    stdio/ftell.c \
+    stdio/fvwrite.c \
+    stdio/gets.c \
+    stdio/printf.c \
+    stdio/refill.c \
+    stdio/rewind.c \
+    stdio/scanf.c \
+    stdio/snprintf.c\
+    stdio/sprintf.c \
+    stdio/sscanf.c \
+    stdio/stdio.c \
+    stdio/ungetc.c \
+    stdio/vasprintf.c \
+    stdio/vfprintf.c \
+    stdio/vfscanf.c \
+    stdio/vprintf.c \
+    stdio/vsnprintf.c \
+    stdio/vsprintf.c \
+    stdio/vscanf.c \
+    stdio/vsscanf.c \
+    stdio/wbuf.c \
+    stdlib/atexit.c \
+    stdlib/ctype_.c \
+    stdlib/getenv.c \
+    stdlib/putenv.c \
+    stdlib/setenv.c \
+    stdlib/strtod.c \
+    stdlib/strtoimax.c \
+    stdlib/strtol.c \
+    stdlib/strtoll.c \
+    stdlib/strtoul.c \
+    stdlib/strtoull.c \
+    stdlib/strtoumax.c \
+    stdlib/tolower_.c \
+    stdlib/toupper_.c \
+    string/strcasecmp.c \
+    string/strcspn.c \
+    string/strdup.c \
+    string/strpbrk.c \
+    string/strsep.c \
+    string/strspn.c \
+    string/strstr.c \
+    string/strtok.c \
+    wchar/wcswidth.c \
+    wchar/wcsxfrm.c \
+    bionic/arc4random.c \
+    bionic/atoi.c \
+    bionic/atol.c \
+    bionic/atoll.c \
+    bionic/bindresvport.c \
+    bionic/clearenv.c \
+    bionic/daemon.c \
+    bionic/err.c \
+    bionic/ether_aton.c \
+    bionic/ether_ntoa.c \
+    bionic/fdprintf.c \
+    bionic/flockfile.c \
+    bionic/ftime.c \
+    bionic/ftok.c \
+    bionic/fts.c \
+    bionic/getdtablesize.c \
+    bionic/gethostname.c \
+    bionic/getpgrp.c \
+    bionic/getpriority.c \
+    bionic/getpt.c \
+    bionic/if_indextoname.c \
+    bionic/if_nametoindex.c \
+    bionic/initgroups.c \
+    bionic/ioctl.c \
+    bionic/isatty.c \
+    bionic/issetugid.c \
+    bionic/ldexp.c \
+    bionic/md5.c \
+    bionic/memmem.c \
+    bionic/memswap.c \
+    bionic/name_mem.c \
+    bionic/pathconf.c \
+    bionic/perror.c \
+    bionic/ptsname.c \
+    bionic/ptsname_r.c \
+    bionic/pututline.c \
+    bionic/reboot.c \
+    bionic/recv.c \
+    bionic/sched_cpualloc.c \
+    bionic/sched_cpucount.c \
+    bionic/semaphore.c \
+    bionic/send.c \
+    bionic/setpgrp.c \
+    bionic/sigblock.c \
+    bionic/siginterrupt.c \
+    bionic/siglist.c \
+    bionic/signame.c \
+    bionic/sigsetmask.c \
+    bionic/strndup.c \
+    bionic/strntoimax.c \
+    bionic/strntoumax.c \
+    bionic/strtotimeval.c \
+    bionic/system_properties.c \
+    bionic/system_properties_compat.c \
+    bionic/tcgetpgrp.c \
+    bionic/tcsetpgrp.c \
+    bionic/time64.c \
+    bionic/umount.c \
+    bionic/unlockpt.c \
+    bionic/utmp.c \
+    bionic/wcscoll.c \
 
 
 libc_dns_src_files += \
@@ -466,10 +466,10 @@
 # Define some common includes
 # ========================================================
 libc_common_c_includes := \
-		$(LOCAL_PATH)/stdlib  \
-		$(LOCAL_PATH)/string  \
-		$(LOCAL_PATH)/stdio   \
-		external/safe-iop/include
+    $(LOCAL_PATH)/stdlib  \
+    $(LOCAL_PATH)/string  \
+    $(LOCAL_PATH)/stdio   \
+    external/safe-iop/include
 
 # ========================================================
 # Add in the arch-specific flags.
@@ -785,8 +785,8 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
 $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
-$(eval $(call patch-up-arch-specific-flags,libc_arch_dynamic_src_files))
-$(eval $(call patch-up-arch-specific-flags,libc_static_common_src_files))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files))
+$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files))
 # special for arm
 LOCAL_NO_CRT_arm := true
 LOCAL_CFLAGS_arm += -DCRT_LEGACY_WORKAROUND