Despite previous online acrimony between the men, the California governor smiled as he shook hands with Trump