fix android build
implement multiple join for files paths
Merge branch 'master' into AndroidKeyListenerChanges