Merge "Remove the obsolete UnpackPackageDir() in edify generator"
am: f7a76f9a30

Change-Id: Ic7f855642457cd6cb977af73fad1ef808326d414