Merge "MediaPlayer2: replace external constant annonations with local ones"