Various device.mk tweaks

Change-Id: I28cd947b73037605aec417060008ee5bf58c1fe4