Merge "fix bad symlink for media/AudioClient.h"