Mk file fixes, qcom init stuff now all included

Change-Id: I7fb1a590948a897d49ac1580295fdf01814ca776