Merge pull request #1338 from jlipps/master

Massive refactor of ADB/Android code
missed some 'node server.js' updates