Merge android-c-openssl and android-x86-c-openssl into single package