Hmm, your definition says "CYBORG" all over it. I think most sci-fiers would say that a robot is a machine, an android is a sentinent robot that looks mainly human, and an cyborg is a human that can be mainly machine.
Ghost in the shell has real fun with this, but don't take my word for it.
cy·borg Audio pronunciation of "cyborg" ( P ) Pronunciation Key (sbôrg)
A human who has certain physiological processes aided or controlled by mechanical or electronic devices.