Merge "Modify any lines with libc.so!libc.so to libc.so."