Adapt to new location of libcore

Change-Id: Ib32222c3541b2aa66df6d6a5519049653647aae7
2 files changed