Merge "Stop writing NUL bytes in adbkey.pub." am: d340c1ebbe am: 68c9642a9d
am: a404e8ffe8

Change-Id: Ibc21fe68f20ac9df1cb1683073b7abd7651cf0b7