packages: always include DeviceControl, change the ifdef logic to ifeq

Change-Id: If5c958eee6a6f651deea897aa24be6eb024c5cca