add Device options, fix reboot options and comment out some CM overlays

Change-Id: Id389385340c92d7348bf7f178beac30a09fb8b19