Adapt to new location of libcore

Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
2 files changed