Merge android-ssl and android-x86-ssl into single package