Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"