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

Change-Id: I348670fbc7855d9c2cf6277debc115ed9fb20ef1