My view is that if its easier to clone and replace a given Fremantle binary than it is to make it work as-is, its ok to clone it. Like the device lock, replacing bits of that if doing so is easier than trying to keep it is how it should be done.
We dont have to store the device lock in the exact same way as stock Fremantle does as long as we provide the functionality.