More updates on device.mk