Merge "Rename libdexfile external API header."