Passing in oldextension variable when doing import or zip extraction

Bug 1318995

Change-Id: I3ab1c23cb5fcd188436224508cf5b9127e7fb290
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge "Passing in oldextension variable when doing import or zip extraction" into 1.7_STABLE