Build changes to work with GamePlay-deps

GamePlay-deps will be introducing a new directory layout.