Merge "Remove libdexfile_external_static_defaults again."