bacon: Remove RECOVERY_VARIANT, cm recovery is default now

Change-Id: I04ce9757ed7eb46be3f454309bb8ded2fdb83b35
Merge branch 'cm' into HEAD