Reworked target architecture selection in the external/Android.mk makefile