Merge "Revert "Move libutils to libc++""