Merge "Some minor updates in the libdexfile external API."