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

* commit '3eb82eca45013e2a78158b8a2f616dba0db958ac':