Revised Android.mk; only import all subdir makefiles

Change-Id: Ifc261a6808cff63ccab6f35c3e8cf7c48c844c67