Adapt to new location of libcore

Change-Id: Ic8106513bd8bd27ccd785f792dca5b2b48fdf9f5
2 files changed