[[ ExternalsApiV5 ]] Further changes to get (Java) Android external working.