Try to fix build for unified devices

Change-Id: Iec1a8ccf4b30adde43ac5d3d16bfd0146c4ffa98