Merge "Remove symlink lib-boostrap"