Improvments to android example.