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