Putting all device images into a same directory when --repackage is given. am: 88576bb1 am: 69406aab am: 7f316bda Change-Id: Id6c604f051e7a16bfef80bfaf049377c0e9afaea