Merge "Remove the obsolete UnpackPackageDir() in edify generator"