Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f am: 84eb1d2cca
am: dcfa920235

* commit 'dcfa9202356af860419e92aceae78563a044818a':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: Ieeb6f2894a4d7b419d5424193a29927af3974bb8