display RECOVERY_VARIANT in build info

ps2:
  fix logic for inclusion of different recovery variants

Change-Id: If95fd668742ab3062e125168c75da29002502939

Remove unused