Set device-specific overlays correctly

Change-Id: I5373376ffc1de324c8c1d468cf37a70f8bd04f2d