Sign final packages with a different key if requested and throw it into recovery builds as well

Change-Id: I602b15cd8281699905597f1b68fdeabc820a51c3