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

Change-Id: Ibfb2a433d379cf62540e09cc71d81cfdef67dbf8