Revert "jfactivexx: MEx merge"

merging forks branches is not a good idea

This reverts commit 49f44213a0fa44c2a57acfecb94193d6ec594ebd

Change-Id: I95e55f43810d5164caf60e2205efe82a453e9da8