move PVR builds back into devices

Change-Id: Ie60004a8e6c6eea93f5b1bbd1042666bf03c8295