More work on the Android side of things.