am 11b9618d: Merge "Fix dx test 124-multidex-option-no-overflow"

* commit '11b9618dafa67f78500ee43b489dae48b6410336':
  Fix dx test 124-multidex-option-no-overflow