Track CM libhardware again