Merge "Adjust to libdexfile API changes"