Merge "Better parcel parsing in MediaMetadataRetriver"