Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." am: 56104e6fb8 am: 212d9f76ba am: 131b3b3e8b
am: 16ad2abc9b

Change-Id: I88c9c39c25970d6873aa42ec146cf35e0c2f9da6