Merge "Change dex naming for output directory"