Updated completed Android solution and instructions