Merge "Move libutils to libc++"