Add option for using a custom ROM zip
Merge remote-tracking branch 'upstream/master' into dspa