Adapt to new location of libcore

Change-Id: I90f482f22fbac82aedbec649a72a465560c3136f
3 files changed