fixing android build

see #13
update read me for android build
fix merge errors