am 4b7b7068: am 793d1023: Merge "miranda multidex test fails on optimizing/arm64."

* commit '4b7b70686d390f3f3c7667efec127640691c42eb':
  miranda multidex test fails on optimizing/arm64.