Copy recovery.img to archive as well so we can upload it

Change-Id: Ifc67d45ddeff055ae4563120ba7f225e3fa454fb
Merge "Copy recovery.img to archive as well so we can upload it" into kk4.4