android support, pedantic mods (int!=int32_t, atan2)
- removed some old code inside test scripts