Updated Android dependencies. Adding some generics! Still a little bit more to do.