Update Android.mk

Update Android.mk for subdir makefiles