Merge "mediaplayer2: rename some MEDIA2_INFO_* constants"