Merge "Add linker entries for the new libdexfiled_external.so."