Fix bash conditional problem - (cond1 || cond2 && cond3) evaluates to (cond1 && cond3) so ndk portions would build and then script would die().
Merge pull request #628 from daveio/master

Fix bash conditional problem