Merge "Revert "AudioFlinger does not need libmedia any more""