Merge "Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java"