Merge "AudioFlinger does not need libmedia any more"