[[ ExternalsApiV5 ]] Further changes to get (Java) Android external working.
Merge commit 'bfdd6557f017803a91e1ef2df645934afc8d6f75' into feature/externals_v5
Fixed some variable name bugs with return results