Merge "Support multidex run-test with Jack" am: 5521889254
am: 6b2239aca2

* commit '6b2239aca2e57e1de6a9c9ca0a97925dcc336935':
  Support multidex run-test with Jack