NickiToUpstream: Add support for non-CM repos
NickiToUpstream: Use PhilZ recovery instead of CWM