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

* commit '0d574614cf568ec34e0804e6f7210a2d1a502d7f':
  Update build-tools and support for multidex.