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

* master:
  fix auto remove build tools