Merge "Tidy up API build variables"