Initial updates to system_core to build with jb-dev