Merge "Make exoplayer2.15.1-core visible to MediaProvider"