Merge "Add XMP offset/size to MediaMetadataRetriever"