Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"