device.mk Misc fixes

Change-Id: Ie895a4da4fb6b862022ad09dde6ec6d1d56d798d