One of my changes needed device enumeration test. The test has gone
stale since the paths have changed. This change fixes the issues.

Test: runtests -t device-enumeration-test succeeds now.

Change-Id: I3ea8564754378e17e699e1fe83db862a5f7c2db9