am 5b559e81: Adapt to new location of libcore