element-x-android

b05e8b7f - Merge pull request #5173 from element-hq/feature/bma/sdk36_2