Enabling org_conscrypt_NativeCrypto.cpp build
Merge branch 'avian-droid' of https://github.com/bigfatbrowncat/avian into avian-droid