Merge "Stop writing NUL bytes in adbkey.pub." into oc-dev