Revert "Add ability to have device-name based options"

Tests fail on fugu:
run-test-args: no such test directory

Bug: 67649705

This reverts commit af2eee5c3f44699ce658c260998117b512cc6626.

Change-Id: Ief5fcdc9003f3daefa0b99c5113c8567e95e9ad9
2 files changed