Snap for 4593582 from fc898fd4922ccd539da063f678388aa435f9257d to pi-release

Change-Id: I9a6f041b910ac339c63c7b41142476aee235657f
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 5df1f94..60be156 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -3296,9 +3296,6 @@
 /* ANDROID CHANGES START*/
 #ifdef ANDROID
 	dir_ent->capabilities = caps;
-	if (android_config) {
-		android_fs_config(fs_config_func, "", &dir_ent->inode->buf, target_out_path, &dir_ent->capabilities);
-	}
 #endif
 /* ANDROID CHANGES END */