Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e
am: 38400b4696

* commit '38400b4696111d88b4fadb1fe99bdd05e40ba6be':
  Don't hardcode expected path to mainDexClasses