Add support for Android 6 again

For time reasons, we could only implement all changes for Android 7 & 7.1, so 6 was left behind. So the task for this issue is to again support Marshmallow by updating the corresponding branch to incorporate all the changes introduced for the beta (and after that). 