Merge "Adapt to new location of libcore" into kraken-plus-aosp