Merge pull request #4862 from owncloud/technical/bump_android_sdk_to_36