Small cleanup and reorganization of device.mk