Merge "Fix bison build with MacOSX SDK 10.6"

Android.mk

diff --git a/Android.mk b/Android.mk
index dc83178..e0329ca 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,6 +108,8 @@
 LOCAL_SRC_FILES += \
     lib/error.c \
     lib/fpending.c \
+    lib/getdelim.c \
+    lib/getline.c \
     lib/getopt.c \
     lib/getopt1.c \
     lib/obstack.c \
@@ -119,6 +121,8 @@
     lib/strchrnul.c \
     lib/strerror-override.c \
     lib/strerror.c \
+    lib/strndup.c \
+    lib/strnlen.c \
     lib/strverscmp.c \
     lib/wcwidth.c
 endif