Revert back to stock rmt_storage
Fix compilation after rild updates

* Don't really think we need to copy these to obj anymore.
  Can't remember why we did it in the first place anyway.