Merge "Stop adding the bootstrap directory to rpath." am: 68d3978fd1
am: 7da0817544

Change-Id: I505c1d73500cbf2f9456d0408cf792f3b3f627a7