move to public
fix define
Update Android.mk