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

Change-Id: Ida8ca98ab23ad38a8b9b152bcbf2bdc2d25dfb69