Revert "Split some device nodes out from device."

This reverts commit f51e9007242c6b7d57f6937ea005a2527d695041

Looks like this caused a build breakage in master, may have a duplicate rule from AOSP.

Change-Id: I4ea83a47baec4ffa2840b5fe50b6f55e1eeda53c
4 files changed