Updated android version to use the abstraction layer.