add back device/common

Change-Id: If1a2f8c9fb681ac4cb7fb04ae616dec2415d842e