update device.mks & repack fix

Change-Id: Id86669dcbb57aa9362cfd5005e08ddcc35d76715