REBASE more reliable integration of Android NDK build files into external/Makefile