This was somewhat broken after the setup_native gbuild conversion.

Change-Id: I825dd5008348534718a5b43e6a3eb893fa75135b