Merge "Add bootstrap directory to bootstrap linker's search path."
am: 8bb97d7781

Change-Id: I160f40e11d854dd635fcc523517954e2bfcaf323