AndroidTodoSample: some cosmetic simplifications.