fix memory.h
update android.mk
Merge branch 'master' into auto-reconn