While I agree with your definitions of what a computation device is, I also don't see Android being developed on Android in the near future. So many UX conceptual problems won't allow this, so I think that as long as computers are required to build smartphones, they cannot be described as "general purpose" machines.
