Merge "Revert "Debuggerd now outputs the offset of libc.so on the device as a separate item.""