Merge "MediaPlayer2: remove hidden api, setMetadataFilter and getMetadata"