Updated android app to use new Java model.