Adapt to new location of libcore

Change-Id: Icfecb1c02b22ced425f030a4b1b86664e2d83fa3
2 files changed