Merge "libdexfile_external is being replaced by libdexfile."