Fixes to Android.mk