Merge "CLEANUP: remove mSystemAudioSource"