Some tidying on AndroidMediaUI and some more groundwork on
AndroidAudioUI.