am 045d4af7: Adapt to new location of libcore

Merge commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80' into kraken

* commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80':
  Adapt to new location of libcore