Use CM external/*

My m7 builds are much more stable with these changes