util/ reorg; rm android-wrapper/ & config.html
util/ update