Revert "Update OSGi R8 APIs"

This reverts commit cee7c1437cc402597ea9120c8631e7594164783a.
3 files changed