Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30 am: cb2490c645 am: 932a9c8a61
am: 9307492d4e

Change-Id: I8a042bb2fa5c7593e6f4cdbe46249f58e12d3858