am 96489645: am e15f6511: Merge "Move multidex support library"

* commit '96489645aba1b3241b10baab6c927c069e48a877':
  Move multidex support library