am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"

* commit '1c7d5d11c73946bd1ff86ad49aa9123a1111610e':
  Remove symlink lib-boostrap