Upgrade RxJava, adding tuples and simple diagrams for config and state.

Change-Id: I362b96cd8690b78fb7cda228b51c9d836f2b106d