Merge "Revert "Revert "Update dexmaker on AOSP to same version as on internal master""" am: ab3dc038 am: 3747caec Change-Id: I9b08948768f77024691abe3a2ea4ac931e42599e