Merge "Move MediaSession2 builder to impl"