am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink"
am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink"

* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
  Host support for prefer symlink

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build