Merge "SyncSM08: statically import tethering error code constant"