Fix DLX and improve m7 makefile naming

Change-Id: If2b3861fbae0472d41f6e888760831cc6a89721e