APC fixes presidential primary for May 30/31, governorship May 23