Snap for 4587185 from 4263485b12278174e253aade22d133c6d1745248 to pi-release

Change-Id: I7ac70124a5b6f20cb9354c8c63a45caf51611931
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 60be156..5df1f94 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -3296,6 +3296,9 @@
 /* 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 */