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

Change-Id: I530208c4267793dc61453f72a395c0604662dfb6