Switch vigor to CyanogenMod code where possible

More CM work has been done to add support for legacy devices.
These changes will enable building without any manifest adds or removes.