Remove the hardcoded "linux-x86" path, and add support for darwin-x86. Change-Id: I4c5db4683a6e8aac7d894e64415142d2ca5954a2