Update p4 for additional build targets