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

* commit '344f76dc1a7cba49664547c128b3ce7651a606e0':
  Remove symlink lib-boostrap