Merge "bionic: fix atfork hanlder_mutex deadlock"