Switch to CM libcore