Merge "Remove dead *_device types from system sepolicy."