Updated for latest usbmuxd and clang