Android changes

Earlier change REDUCED accuracy on Android, should definitely have used
a ruler...