fix auto remove build tools
Merge branch 'master' into java8

* master:
  fix auto remove build tools