Merge "Stop writing NUL bytes in adbkey.pub."