Merge "libdexfile_external is replaced by libdexfile (reland)."