Merge "Fix idmap calls when a subdir is present." into cw-f-dev

                }

                // Generic idmap parameters

                const char* argv[7];

                const char* argv[8];

                int argc = 0;

                struct stat st;

                // Finally, invoke idmap (if any overlay directory exists)

                if (argc > 5) {

                    execv(AssetManager::IDMAP_BIN, (char* const*)argv);

                    ALOGE("failed to execl for idmap: %s", strerror(errno));

                    ALOGE("failed to execv for idmap: %s", strerror(errno));

                    exit(1); // should never get here

                } else {

                    exit(0);