Merge "API review: move PlaybackGlue classes into media package" into nyc-support-25.1-dev
am: f6b8fb1699

Change-Id: I69087c69c17ec4848c70f3e042713998eba3739c