am 5d522dd8: Merge commit \'a40954fd\' into HEAD

* commit '5d522dd85ba1514bcf2b79993341971f9729fc6d':
  Update the build tools version