[automerger skipped] Merge Android R am: e76a9db32d -s ours am: 9179242d68 -s ours

am skip reason: Change-Id I32a7ca28f66d8350a9a1bebe88d5aa7481a4ce0b with SHA-1 2a153ae758 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libmpeg2/+/1422376

Change-Id: I41ef6a5e1ed29e6c056c5473f146f211cc699504