Merge "MP2: replace AudioSystem APIs with public ones in mediaplayer2.cpp"