Manual Merge of toMap/toMultiMap

Manual merge of https://github.com/Netflix/RxJava/pull/513