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

* commit '6f1f20622e269a4118e73c8da71a235b01924fee':
  updater: Clean up C codes.