Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I4aa16709c0edf00353e2e6f011d04f2cf848f5bb
diff --git a/src/android.c b/src/android.c
index 6eeefec..2fd1fac 100644
--- a/src/android.c
+++ b/src/android.c
@@ -1193,7 +1193,7 @@
     FTS *fts;
     FTSENT *ftsent;
     char *const paths[2] = { __UNCONST(pathname), NULL };
-    int ftsflags = FTS_COMFOLLOW | FTS_NOCHDIR | FTS_XDEV | FTS_PHYSICAL;
+    int ftsflags = FTS_NOCHDIR | FTS_XDEV | FTS_PHYSICAL;
     int error, sverrno;
     char xattr_value[FC_DIGEST_SIZE];
     ssize_t size;