Revert "Missing Crdroid Device Utils"

This reverts commit 4c41ff37e59f8b0b5659708077e4c94587141c7e.