Merge "Stop writing NUL bytes in adbkey.pub." into oc-dev am: 39225a131b
am: fa60816271

Change-Id: Iff3fd27706c0a1d6a5fa919dc94a1288aa6b5b33