Merge "Update name of static libdexfile library."