Synchronize Mac init and JNI code.#1335

prbprbprb wants to merge 3 commits into

google:mastergoogle/conscrypt:masterfrom

prbprbprb:mac_stressprbprbprb/conscrypt:mac_stressCopy head branch name to clipboard