Merge "updater: Clean up C codes."