Merge "Revert "Move error_code.h into otautil.""