Merge "Strip all multidex files, not just classes.dex"