Merge "Change dex naming for output directory"
am: b9bdf3906c

Change-Id: I7f8b8174497475747a01c073f362206e02255f22