[tor-commits] [orbot/master] clean up of main class imports