Rename m7 kernel to allow ours and cm's to coexist for m7 and dlx, respectively

Change-Id: I856eb298cb607ae55fa79d1b41c7a88ceae1a5c3
Revert "Track our dlx"

This reverts commit a3807c064372f70e530179413644020be8180de4.