Merge "Remove global linker search paths" am: 39c1c9ae12 am: 01d1c0b442
am: 6b7762a458

Change-Id: I216f2ec8c20182745edd25c442360b9303b52ad2