Restrict this version to Android >= 2.3
Partially revert < 2.3 compatibility mode

This reverts part of 46675dfdcb4c7b511b4c35e4a2242e47d4678fd4. However,
since this commit did some cleanup and simplifications, we keep them.
Remove now useless changes to RxJava