Update rust-core to upstream-master + hacks to get to compile