am 34ba2331: Merge "Support dx generating multiple dex files."

* commit '34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
  Support dx generating multiple dex files.