Merge "Allow /dev/goldfish_sync"