Merge "Stop adding the bootstrap directory to rpath."