Add device codename to zip format

Change-Id: I868d324b230a355eede3e374f66dfaadc0d30849
Merge "Add device codename to zip format" into lollipop