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

This reverts commit e7e54fac10cce1472fa8667566a7f95754a74ecc

Change-Id: I26b577cf46a0eaccf6adf7ae851383a10bf03b4b
4 files changed