am 630a1be4: Merge "Remove symlink lib-boostrap"

* commit '630a1be4ec2dadaa3a18b6a51d8b006042e4f27a':
  Remove symlink lib-boostrap