Skyrocket: Small cleanup of device folder

Change-Id: I056b16c646de13af0610f39640b8046df0007935