Merge "releasetools: Drop the support for creating image archive from dir." am: 28dd0c83a2 am: a4a236e318 am: 837989ef37
am: 4e40178208

Change-Id: I117f783d964c6d362f5c4e8661d4886b86765305