Revert "Removed /system format on OTA zip's."

Clean install is better.

This reverts commit 20460e5260540fb7677d9f728e241477e31fece2.
Change name of keys

from test-keys to release-keys for propper play store with user build.