android-ocamlfind fixes (from Chris Greenhalgh's fork)