merge: record livekit/master merge-base

Squash-merge of PR #31 flattened the merge commits that advanced the
merge-base. This ghost merge (-s ours) records that master has seen
livekit/master up to this point without changing any files.
All relevant changes were already cherry-picked into master.

Author: santhoshvai