Tidy up Android Manifest