Clean up mercury extra proc and use aligned extra buf allocation
Clean up mercury extra proc and use aligned extra buf allocation

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury