Merge "Update dx.jar to version 1.10"