patch applied upstream 88bc7c2ba05f195f39521a0b71a799b80c830064
do not download NDK if already declared
Merge pull request #2 from tfoote/patches

A few small patches