Fixes 6.7 merge issue, and non-returning on external.c
Fix 'nil' use in external.c
Fix Android project compilation - revtestexternal has not to be compiled in a release