i9300: more cleanup and include gsm packages