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

* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
  Update build-tools and support for multidex.