Adapt to new location of libcore

Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
2 files changed