Fix display HAL includes for non-CAF display HAL