Merge "MediaPlayer2: remove unused code setMetadataFilter and getMetadata"