Update migrated files to build locally.
Merge in stock piece from init

This gets lte/cdma/3g handoff working