Update recovery_keys.c

See: http://review.cyanogenmod.org/62724

Change-Id: I022ba17019de4684b1811259068dba2af5ebbfad
Conflicts:
	recovery/recovery_keys.c
Common updates + add localhd thanks to psyke83