Merge changes from topic "libogg_upgrade" into main am: c0fe8bca28 am: 175c78ee06 am: fd32b1ec3e am: 6318572874 am: cc5430e932

Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/2704404

Change-Id: I6f3a80e54acf6cc046d9be7275bbbd2155685681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>