Possible fix

Change-Id: Ifcfe292d84e4955821b6b56bbedaeab3003791f3
A better way to address register_org_conscrypt_NativeCrypto issue

Change-Id: Ic8abeedbbe7673bb023bca6d5183650b32ce53e3