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

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