now building as a static lib with android ndk
Merge branches 'androidbuild' and 'master'