Revert "Try not to replace ocamlfind.in"

This reverts commit 1057c24fc45fcb8ad05f5c46d679c551cd8afa4b.
Merge android-ocamlfind and android-x86-ocamlfind into single package