cm-10.1: fix overlay derp, make simpler OTA releasetools override (and also fix cmupdater not keeping existing pkgs)