Revert "Revert "Split some device nodes out from device.""

This reverts commit 1c101164c00739cfae0a86c071f8eb713542d943

Restoring now that the conflict with tuna has passed.

Change-Id: I587dab8d7102c913fc03825a006e96d76680858d
4 files changed