[[ Bugfix 11333 ]] Set the name of the Android mainstack to apk/mainstack.
Merge branch 'bugfix-11333' into release-6.1.3