Merge branch 'hotfix/v1.2.2'
Adding support for building on Android.
Merge branch 'hotfix/v1.2.3' into develop