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