am 8361bb0d: Update build-tools and support for multidex.

* commit '8361bb0dfa16a3acc7752324e4690598ae0f2320':
  Update build-tools and support for multidex.