Some minor changes

changed the name from Z-Android to Z-Droid, there were still some
instances of Z-Android in the code