am a70e2647: Adapt to new location of libcore

Merge commit 'a70e264763b073e1f30867f96fce936d25cf1de0' into kraken

* commit 'a70e264763b073e1f30867f96fce936d25cf1de0':
  Adapt to new location of libcore