Merge "Adjust symbol lookup for DT_SYMBOLIC case"