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

* commit '793d1023785f81eb8e29a3eb67fec17d7ee7dcbe':
  miranda multidex test fails on optimizing/arm64.