Merge "Clean up the arg setup for exec(3)."
am: f0c03e62a2

Change-Id: I402eae7a950f10e3ceb99291db07e68dd91861e1