Merge branch 'feature/CELIX-247_android_support' of https://git-wip-us.apache.org/repos/asf/celix into feature/CELIX-247_android_support