move to the latest cm4 stuff

Signed-off-by: Chris Granger <ibdknox@gmail.com>