Merge pull request #73 from jroelofs/jroelofs-work2

Fix #if guard comment typo & remove debug print
Fix target2 lookup on bare-metal
Merge branch 'master' of github.com:awong-dev/ndk into jroelofs-work2