Update APNs from CM

Change-Id: I65fc595d47f2fc648fb63b5a8b39445688d3a2a5
Fix DLX and improve m7 makefile naming

Change-Id: If2b3861fbae0472d41f6e888760831cc6a89721e
Merge "Update APNs from CM" into kk44
Merge remote-tracking branch 'upstream/kk44' into kk44