Merge "Remove bzero from libc.so"
am: ef4e192c8b

* commit 'ef4e192c8b9acd924a0e617abb98350e073e90ff':
  Remove bzero from libc.so