Merge "Fix the system_error while calling thread::join() in NativeCallbackThread."
am: 56104e6fb8

Change-Id: Idc11c245841a45882ddb90849c35e98d678947cc