diff --git a/adb/Android.mk b/adb/Android.mk
index df96d58..6ed31eb 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -83,7 +83,7 @@
 
 include $(BUILD_HOST_EXECUTABLE)
 
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
+$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
 
 ifeq ($(HOST_OS),windows)
 $(LOCAL_INSTALLED_MODULE): \
diff --git a/cpio/Android.mk b/cpio/Android.mk
index 8d01852..5184463 100644
--- a/cpio/Android.mk
+++ b/cpio/Android.mk
@@ -10,4 +10,4 @@
 
 include $(BUILD_HOST_EXECUTABLE)
 
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
+$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 34380ec..3c5538f 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -50,7 +50,7 @@
 LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz
 
 include $(BUILD_HOST_EXECUTABLE)
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
+$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
 
 ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
diff --git a/include/arch/darwin-x86/AndroidConfig.h b/include/arch/darwin-x86/AndroidConfig.h
index 6be3416..c8ccc7e 100644
--- a/include/arch/darwin-x86/AndroidConfig.h
+++ b/include/arch/darwin-x86/AndroidConfig.h
@@ -159,7 +159,7 @@
 #define _LARGEFILE_SOURCE 1
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 /* #define HAVE_OFF64_T */
 
diff --git a/include/arch/freebsd-x86/AndroidConfig.h b/include/arch/freebsd-x86/AndroidConfig.h
index ad96e55..d828bd5 100644
--- a/include/arch/freebsd-x86/AndroidConfig.h
+++ b/include/arch/freebsd-x86/AndroidConfig.h
@@ -175,7 +175,7 @@
 #define _LARGEFILE_SOURCE 1
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 /* #define HAVE_OFF64_T */
 
diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h
index 48488f9..83891cd 100644
--- a/include/arch/linux-arm/AndroidConfig.h
+++ b/include/arch/linux-arm/AndroidConfig.h
@@ -174,7 +174,7 @@
 /* #define _LARGEFILE_SOURCE 1 */
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 #define HAVE_OFF64_T
 
diff --git a/include/arch/linux-ppc/AndroidConfig.h b/include/arch/linux-ppc/AndroidConfig.h
index 6ff50a3..00706dc 100644
--- a/include/arch/linux-ppc/AndroidConfig.h
+++ b/include/arch/linux-ppc/AndroidConfig.h
@@ -164,7 +164,7 @@
 #define _LARGEFILE_SOURCE 1
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 #define HAVE_OFF64_T
 
diff --git a/include/arch/linux-sh/AndroidConfig.h b/include/arch/linux-sh/AndroidConfig.h
index d389a0b..5562eae 100644
--- a/include/arch/linux-sh/AndroidConfig.h
+++ b/include/arch/linux-sh/AndroidConfig.h
@@ -174,7 +174,7 @@
 /* #define _LARGEFILE_SOURCE 1 */
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 #define HAVE_OFF64_T
 
diff --git a/include/arch/linux-x86/AndroidConfig.h b/include/arch/linux-x86/AndroidConfig.h
index 612c070..7dcaa98 100644
--- a/include/arch/linux-x86/AndroidConfig.h
+++ b/include/arch/linux-x86/AndroidConfig.h
@@ -164,7 +164,7 @@
 #define _LARGEFILE_SOURCE 1
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 #define HAVE_OFF64_T
 
diff --git a/include/arch/target_linux-x86/AndroidConfig.h b/include/arch/target_linux-x86/AndroidConfig.h
index c1a7771..05dd220 100644
--- a/include/arch/target_linux-x86/AndroidConfig.h
+++ b/include/arch/target_linux-x86/AndroidConfig.h
@@ -163,7 +163,7 @@
  */
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
 #define HAVE_OFF64_T
 
diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h
index dc7b619..ad890b4 100644
--- a/include/arch/windows/AndroidConfig.h
+++ b/include/arch/windows/AndroidConfig.h
@@ -177,9 +177,9 @@
 #define _LARGEFILE_SOURCE 1
 
 /*
- * Define if off_t is always 64-bit
+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
  */
-/* #define HAVE_OFF64_T */
+#define HAVE_OFF64_T
 
 /*
  * Defined if we have the backtrace() call for retrieving a stack trace.
diff --git a/init/init.c b/init/init.c
index ea7687d..7aef387 100755
--- a/init/init.c
+++ b/init/init.c
@@ -196,10 +196,6 @@
         char tmp[32];
         int fd, sz;
 
-        if (svc->flags & SVC_SLOW_START) {
-            sleep(5);
-        }
-
         if (properties_inited()) {
             get_property_workspace(&fd, &sz);
             sprintf(tmp, "%d,%d", dup(fd), sz);
diff --git a/init/init.h b/init/init.h
index 9a202b7..8691335 100644
--- a/init/init.h
+++ b/init/init.h
@@ -69,7 +69,6 @@
 #define SVC_RESTARTING  0x08  /* waiting to restart */
 #define SVC_CONSOLE     0x10  /* requires console */
 #define SVC_CRITICAL    0x20  /* will reboot into recovery if keeps crashing */
-#define SVC_SLOW_START  0x40  /* wait a few seconds before starting */
 
 #define NR_SVC_SUPP_GIDS 12    /* twelve supplementary groups */
 
diff --git a/init/init_parser.c b/init/init_parser.c
index 1b7522c..d136c28 100644
--- a/init/init_parser.c
+++ b/init/init_parser.c
@@ -131,7 +131,6 @@
         if (!strcmp(s, "etkey")) return K_setkey;
         if (!strcmp(s, "etprop")) return K_setprop;
         if (!strcmp(s, "etrlimit")) return K_setrlimit;
-        if (!strcmp(s, "low_start")) return K_slow_start;
         if (!strcmp(s, "ocket")) return K_socket;
         if (!strcmp(s, "tart")) return K_start;
         if (!strcmp(s, "top")) return K_stop;
@@ -565,9 +564,6 @@
     case K_critical:
         svc->flags |= SVC_CRITICAL;
         break;
-    case K_slow_start:
-        svc->flags |= SVC_SLOW_START;
-        break;
     case K_setenv: { /* name value */
         struct svcenvinfo *ei;
         if (nargs < 2) {
diff --git a/init/keywords.h b/init/keywords.h
index 8710523..25315d8 100644
--- a/init/keywords.h
+++ b/init/keywords.h
@@ -62,7 +62,6 @@
     KEYWORD(setkey,      COMMAND, 0, do_setkey)
     KEYWORD(setprop,     COMMAND, 2, do_setprop)
     KEYWORD(setrlimit,   COMMAND, 3, do_setrlimit)
-    KEYWORD(slow_start,  OPTION,  0, 0)
     KEYWORD(socket,      OPTION,  0, 0)
     KEYWORD(start,       COMMAND, 1, do_start)
     KEYWORD(stop,        COMMAND, 1, do_stop)
diff --git a/mkbootimg/Android.mk b/mkbootimg/Android.mk
index 18f0ff3..2a97c26 100644
--- a/mkbootimg/Android.mk
+++ b/mkbootimg/Android.mk
@@ -9,4 +9,4 @@
 
 include $(BUILD_HOST_EXECUTABLE)
 
-$(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
+$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
diff --git a/rootdir/init.rc b/rootdir/init.rc
index acf1f7c..a6ce529 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -343,8 +343,6 @@
     user media
     group system audio camera graphics inet net_bt net_bt_admin net_raw
     ioprio rt 4
-    # STOPSHIP fix audio driver for real rather than use slow_start b/3249002
-    slow_start
 
 service bootanim /system/bin/bootanimation
     user graphics
diff --git a/sh/trap.c b/sh/trap.c
index 7cb5201..dcd76ac 100644
--- a/sh/trap.c
+++ b/sh/trap.c
@@ -100,7 +100,7 @@
 		p += 3;
 
 	for (i = 0; i < NSIG; ++i)
-		if (strcasecmp (p, sys_signame[i]) == 0)
+		if (sys_signame[i] && (strcasecmp (p, sys_signame[i]) == 0))
 			return i;
 	return -1;
 }