Switched to upstream libcore