Android path cleanup; add NDK to PATH