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

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