Merge latest smack master into mercury master#24

Open

Flowdalic wants to merge 1 commit intoFlowdalic:mercury_master_smack_mergefrom

vanitasvitae:mercury_master

Commits on Sep 12, 2019

Don't compile android.jar contents into smack-android jar
vanitasvitae
committed