am 54404adb: am 79e08820: Merge "Add tests about dx multidex options."

* commit '54404adb33f07f256c51f40719eeef321f7f4716':
  Add tests about dx multidex options.