Adapt to new location of libcore

Change-Id: I248bd34ceb3394a4e8f10135ed6fba19d8343b3c
2 files changed