am 6997c287: Merge "updater: Clean up C codes."

* commit '6997c287bedbd32fb5ffb84fc2efd081e6f56d3e':
  updater: Clean up C codes.