Merge "versioner: Fix bzero/bcopy fortify" am: 2fb9a03b9c
am: cbf4e805f8

Change-Id: I7c54285d066f9c646c588ac45c6c770f585e3a35