am f46f1a97: Move build tools version to 18.1.0 - do not merge.

* commit 'f46f1a979b7c1e1a4e1ece29f1477ae96af0bc7a':
  Move build tools version to 18.1.0 - do not merge.