Merge "Revert "libdexfile_external is being replaced by libdexfile.""