Adapt to new location of libcore

Change-Id: I4ad03a41718d3c30ce4117114f71b07a3d023dde
3 files changed