Some fixes for Android.mk and man_pref.xml