Merge "Add debug code for saving dex file inputs"