Feature/refactor bitmask android to use newer ics openvpn features/methods #5709

Imported modifications from branch ics-openvpn-upstream